merge trunk
authorKenichi Handa <handa@etlken>
Wed, 28 Apr 2010 01:00:38 +0000 (10:00 +0900)
committerKenichi Handa <handa@etlken>
Wed, 28 Apr 2010 01:00:38 +0000 (10:00 +0900)

Trivial merge